From e63d5cf9da75728b63ffc2e51f88362b819ad515 Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Thu, 25 Jun 2020 20:31:12 -0400 Subject: [PATCH] fix patches --- ...=> 0003-data-Explicitly-use-python3.patch} | 32 +++++++++---------- debian/patches/series | 2 +- debian/patches/use-cmake-install-libdir.patch | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) rename debian/patches/{0004-data-Explicitly-use-python3.patch => 0003-data-Explicitly-use-python3.patch} (77%) diff --git a/debian/patches/0004-data-Explicitly-use-python3.patch b/debian/patches/0003-data-Explicitly-use-python3.patch similarity index 77% rename from debian/patches/0004-data-Explicitly-use-python3.patch rename to debian/patches/0003-data-Explicitly-use-python3.patch index c5d991d..2388a8d 100644 --- a/debian/patches/0004-data-Explicitly-use-python3.patch +++ b/debian/patches/0003-data-Explicitly-use-python3.patch @@ -1,10 +1,10 @@ From: Boyuan Yang -Date: Mon, 13 Apr 2020 18:18:19 -0400 +Date: Thu, 25 Jun 2020 20:32:44 -0400 Subject: data/: Explicitly use python3 Before "python" is default to python3, this patch should be kept. -Last-Update: 2020-04-13 +Last-Update: 2020-06-25 --- data/scripts/find_target.py | 2 +- data/scripts/merge.py | 2 +- @@ -14,52 +14,52 @@ Last-Update: 2020-04-13 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py -index 28ada27..ffb3704 100755 +index 4244949..7b2b477 100755 --- a/data/scripts/find_target.py +++ b/data/scripts/find_target.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #coding: utf-8 + # -*- coding: utf-8 -*- + import sys - from common import find_target_items diff --git a/data/scripts/merge.py b/data/scripts/merge.py -index 170bf60..4200b8b 100755 +index 680c90e..01fcf51 100755 --- a/data/scripts/merge.py +++ b/data/scripts/merge.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #coding: utf-8 + # -*- coding: utf-8 -*- + import codecs - import sys diff --git a/data/scripts/reverse.py b/data/scripts/reverse.py -index f702460..2a47a9e 100755 +index 746f887..a87ae46 100755 --- a/data/scripts/reverse.py +++ b/data/scripts/reverse.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #coding: utf-8 + # -*- coding: utf-8 -*- + import sys - from common import reverse_items diff --git a/data/scripts/sort.py b/data/scripts/sort.py -index 8268bde..1585ccb 100755 +index f7d4dc5..6ad6e8c 100755 --- a/data/scripts/sort.py +++ b/data/scripts/sort.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #coding: utf-8 + # -*- coding: utf-8 -*- import sys - from common import sort_items + diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py -index 0cecdaa..2cad6f9 100755 +index 20d82fd..11bc4c9 100755 --- a/data/scripts/sort_all.py +++ b/data/scripts/sort_all.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #coding: utf-8 + # -*- coding: utf-8 -*- import glob import sys diff --git a/debian/patches/series b/debian/patches/series index 9f0877f..1528142 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ use-cmake-install-libdir.patch 0003-use-system-libraries.patch -0004-data-Explicitly-use-python3.patch +0003-data-Explicitly-use-python3.patch diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch index 9677493..11be2e9 100644 --- a/debian/patches/use-cmake-install-libdir.patch +++ b/debian/patches/use-cmake-install-libdir.patch @@ -8,10 +8,10 @@ Subject: use-cmake-install-libdir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05fff42..876bfb1 100644 +index 08d186a..efb51ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) +@@ -74,7 +74,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) set (DIR_INCLUDE ${DIR_PREFIX}/include/) set (DIR_SHARE ${DIR_PREFIX}/share/) set (DIR_ETC ${DIR_PREFIX}/etc/) -- 2.30.2